bitkeeper revision 1.1159.212.39 (41f654d8oXg3D1jTyrHKYjWTMVzAew)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 25 Jan 2005 14:16:56 +0000 (14:16 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 25 Jan 2005 14:16:56 +0000 (14:16 +0000)
commit6a9d18341ec91300802df8c6ede0493a3fe9b380
tree57d1d7251117ecf24cd243c32ac9ed2a691a4449
parentf36f30128e7fa1ab638ff4479cf81d84214dc08c
bitkeeper revision 1.1159.212.39 (41f654d8oXg3D1jTyrHKYjWTMVzAew)

manual merge.
xen/common/physdev.c
xen/common/sched_bvt.c